fix: merge conflict backporting pr-9821 #9888
+2
−145
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.